Merge tag 'for-master-20190205' of git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Tue, 5 Feb 2019 13:32:52 +0000 (08:32 -0500)
committerTom Rini <[email protected]>
Tue, 5 Feb 2019 13:32:52 +0000 (08:32 -0500)
Removes artifacts (.rej-files) from the last merge.


Trivial merge